From a5c0a5c54675d855d93aa75b2b3344a12e70154a Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Sun, 15 Oct 2017 12:55:22 +0100 Subject: [PATCH] a11y/entry: Fixups for previous commit We still declare all variables at the start of the block. Also, we can use the fast private _gtk_widget_get_allocation(). https://bugzilla.gnome.org/show_bug.cgi?id=784509 --- gtk/a11y/gtkentryaccessible.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c index 9519b091c5..1df260c0bf 100644 --- a/gtk/a11y/gtkentryaccessible.c +++ b/gtk/a11y/gtkentryaccessible.c @@ -28,6 +28,7 @@ #include "gtkentryprivate.h" #include "gtkcomboboxaccessible.h" #include "gtkstylecontextprivate.h" +#include "gtkwidgetprivate.h" #define GTK_TYPE_ENTRY_ICON_ACCESSIBLE (gtk_entry_icon_accessible_get_type ()) #define GTK_ENTRY_ICON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_ICON_ACCESSIBLE, GtkEntryIconAccessible)) @@ -956,6 +957,7 @@ gtk_entry_accessible_get_character_extents (AtkText *text, gint index, x_layout, y_layout; GdkWindow *window; gint x_window, y_window; + GtkAllocation allocation; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); if (widget == NULL) @@ -971,8 +973,7 @@ gtk_entry_accessible_get_character_extents (AtkText *text, pango_layout_index_to_pos (gtk_entry_get_layout (entry), index, &char_rect); pango_extents_to_pixels (&char_rect, NULL); - GtkAllocation allocation; - gtk_widget_get_allocation (widget, &allocation); + _gtk_widget_get_allocation (widget, &allocation); window = gtk_widget_get_window (widget); gdk_window_get_origin (window, &x_window, &y_window); -- 2.30.2